# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.676.12.16 -> 1.676.12.17
# arch/ia64/hp/zx1/hpzx1_misc.c 1.1 -> 1.2
# arch/ia64/kernel/acpi.c 1.8 -> 1.9
# arch/ia64/hp/common/sba_iommu.c 1.2 -> 1.3
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/09/27 willy@fc.hp.com 1.676.12.17
# ia64: Remove support for HP prototypes.
# --------------------------------------------
#
diff -Nru a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
--- a/arch/ia64/hp/common/sba_iommu.c Wed Oct 8 09:10:07 2003
+++ b/arch/ia64/hp/common/sba_iommu.c Wed Oct 8 09:10:07 2003
@@ -1608,6 +1608,7 @@
(info->init)(ioc);
}
}
+
if (!ioc->name)
ioc->name = "Unknown";
diff -Nru a/arch/ia64/hp/zx1/hpzx1_misc.c b/arch/ia64/hp/zx1/hpzx1_misc.c
--- a/arch/ia64/hp/zx1/hpzx1_misc.c Wed Oct 8 09:10:07 2003
+++ b/arch/ia64/hp/zx1/hpzx1_misc.c Wed Oct 8 09:10:07 2003
@@ -17,8 +17,6 @@
#include <asm/dma.h>
#include <asm/iosapic.h>
-extern acpi_status acpi_evaluate_integer (acpi_handle, acpi_string, acpi_object_list *, unsigned long *);
-
#define PFX "hpzx1: "
static int hpzx1_devices;
@@ -252,40 +250,8 @@
* HWP0003: AGP LBA device
*/
acpi_get_devices("HWP0001", hpzx1_sba_probe, "HWP0001", NULL);
-#ifdef CONFIG_IA64_HP_PROTO
- if (hpzx1_devices) {
-#endif
acpi_get_devices("HWP0002", hpzx1_lba_probe, "HWP0002 PCI LBA", NULL);
acpi_get_devices("HWP0003", hpzx1_lba_probe, "HWP0003 AGP LBA", NULL);
-
-#ifdef CONFIG_IA64_HP_PROTO
- }
-
-#define ZX1_FUNC_ID_VALUE (PCI_DEVICE_ID_HP_ZX1_SBA << 16) | PCI_VENDOR_ID_HP
- /*
- * Early protos don't have bridges in the ACPI namespace, so
- * if we didn't find anything, add the things we know are
- * there.
- */
- if (hpzx1_devices == 0) {
- u64 hpa, csr_base;
-
- csr_base = 0xfed00000UL;
- hpa = (u64) ioremap(csr_base, 0x2000);
- if (__raw_readl(hpa) == ZX1_FUNC_ID_VALUE) {
- hpzx1_fake_pci_dev("HWP0001 SBA", 0, csr_base, 0x1000);
- hpzx1_fake_pci_dev("HWP0001 IOC", 0, csr_base + 0x1000,
- 0x1000);
-
- csr_base = 0xfed24000UL;
- iounmap(hpa);
- hpa = (u64) ioremap(csr_base, 0x1000);
- hpzx1_fake_pci_dev("HWP0003 AGP LBA", 0x40, csr_base,
- 0x1000);
- }
- iounmap(hpa);
- }
-#endif
}
extern void sba_init(void);
diff -Nru a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
--- a/arch/ia64/kernel/acpi.c Wed Oct 8 09:10:07 2003
+++ b/arch/ia64/kernel/acpi.c Wed Oct 8 09:10:07 2003
@@ -102,8 +102,6 @@
return "sn2";
# elif defined (CONFIG_IA64_DIG)
return "dig";
-# elif defined (CONFIG_IA64_HP_ZX1)
- return "hpzx1";
# else
# error Unknown platform. Fix acpi.c.
# endif